Merge branch 'master' into nukei-m

diff --cc CMakeLists.txt
index 373d07f0f6072d420f522873a16059eb57de06e1,302fed5183eb49724dec5a3f0d8a9ca8b9446c11..25ef6ac5544f6ccb2f086de906c0a79cdb5f87d9
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -81,14 -81,10 +81,9 @@@ set(MINIMAL_FMT
  
  # ALL_FMTS
  set(ALL_FMTS ${MINIMAL_FMTS}
 -  bcr.cc
    brauniger_iq.cc
-   delgpl.cc
-   destinator.cc
    dg-100.cc
    dmtlog.cc
-   easygps.cc
-   energympro.cc
-   enigma.cc
    exif.cc
    garmin_fit.cc
    garmin_gpi.cc

diff --cc GPSBabel.pro
index 95f2c8000a31c555ddde50798fb75adfb7515eec,421babc25c00a7d582f483ca3ebf867f2acb6c9e..ae0f9a8f8b74d115aaec0376b35b616d34c31aa2
--- 1/GPSBabel.pro
--- 2/GPSBabel.pro
+++ b/GPSBabel.pro
@@@ -56,14 -56,10 +56,9 @@@ MINIMAL_FMTS = 
  
  # ALL_FMTS
  ALL_FMTS = $$MINIMAL_FMTS \
 -  bcr.cc \
    brauniger_iq.cc \
-   delgpl.cc \
-   destinator.cc \
    dg-100.cc \
    dmtlog.cc \
-   easygps.cc \
-   energympro.cc \
-   enigma.cc \
    exif.cc \
    f90g_track.cc \
    garmin_fit.cc \

diff --cc gpsbabel.qrc
Simple merge

diff --cc reference/format0.txt
Simple merge

diff --cc reference/format1.txt
Simple merge

diff --cc reference/format2.txt
Simple merge

diff --cc reference/format3.txt
Simple merge

diff --cc reference/help.txt
Simple merge

diff --cc vecs.cc
index 919db376e1ffd3121b095efdcd9e422e777663b4,4f06c2d75d9a4c24847e4cbc7502e4efa06e136e..8d6c450b2155fca1e6276c09cd5e0f70a93c0022
--- 1/vecs.cc
--- 2/vecs.cc
+++ b/vecs.cc
@@@ -97,33 -98,30 +93,25 @@@ extern ff_vecs_t wbt_svecs
  #if MAXIMAL_ENABLED
  extern ff_vecs_t wbt_fvecs;
  //extern ff_vecs_t wbt_fvecs;
- extern ff_vecs_t hiketech_vecs;
- extern ff_vecs_t glogbook_vecs;
  extern ff_vecs_t vcf_vecs;
- extern ff_vecs_t google_dir_vecs;
  extern ff_vecs_t tomtom_vecs;
 -extern ff_vecs_t bcr_vecs;
 -extern ff_vecs_t ignr_vecs;
  extern ff_vecs_t gtm_vecs;
  extern ff_vecs_t gpssim_vecs;
  #if CSVFMTS_ENABLED
  extern ff_vecs_t garmin_txt_vecs;
  #endif // CSVFMTS_ENABLED
  extern ff_vecs_t dmtlog_vecs;
--extern ff_vecs_t raymarine_vecs;
 -extern ff_vecs_t lmx_vecs;
++extern ff_vecs_t raymarine_vecs;\
 +extern ff_vecs_t ggv_log_vecs;
  extern ff_vecs_t xol_vecs;
  extern ff_vecs_t navilink_vecs;
- extern ff_vecs_t destinator_poi_vecs;
- extern ff_vecs_t destinator_itn_vecs;
- extern ff_vecs_t destinator_trl_vecs;
 -extern ff_vecs_t ik3d_vecs;
 -extern ff_vecs_t igo8_vecs;
 -extern ff_vecs_t mapasia_tr7_vecs;
 +extern ff_vecs_t gnav_trl_vecs;
  extern ff_vecs_t navitel_trk_vecs;
- extern ff_vecs_t ggv_ovl_vecs;
  extern ff_vecs_t itracku_vecs;
  extern ff_vecs_t itracku_fvecs;
  extern ff_vecs_t sbp_vecs;
  extern ff_vecs_t sbn_vecs;
 -extern ff_vecs_t mmo_vecs;
  extern ff_vecs_t v900_vecs;
- extern ff_vecs_t enigma_vecs;
  extern ff_vecs_t format_garmin_xt_vecs;
  #endif // MAXIMAL_ENABLED
  
@@@ -176,11 -173,11 +162,8 @@@ struct Vecs::Imp
  #if MAXIMAL_ENABLED
    LegacyFormat wbt_ffmt {wbt_fvecs};
  //LegacyFormat wbt_ffmt {wbt_fvecs};
-   LegacyFormat hiketech_fmt {hiketech_vecs};
-   LegacyFormat glogbook_fmt {glogbook_vecs};
    LegacyFormat vcf_fmt {vcf_vecs};
-   LegacyFormat google_dir_fmt {google_dir_vecs};
    LegacyFormat tomtom_fmt {tomtom_vecs};
 -  TefXMLFormat tef_xml_fmt;
 -  LegacyFormat bcr_fmt {bcr_vecs};
 -  LegacyFormat ignr_fmt {ignr_vecs};
    UnicsvFormat unicsv_fmt;
    LegacyFormat gtm_fmt {gtm_vecs};
    LegacyFormat gpssim_fmt {gpssim_vecs};
@@@ -190,8 -187,8 +173,7 @@@
    GtrnctrFormat gtc_fmt;
    LegacyFormat dmtlog_fmt {dmtlog_vecs};
    LegacyFormat raymarine_fmt {raymarine_vecs};
-   LegacyFormat ggv_log_fmt {ggv_log_vecs};
    GarminGPIFormat garmin_gpi_fmt;
 -  LegacyFormat lmx_fmt {lmx_vecs};
    RandomFormat random_fmt;
    LegacyFormat xol_fmt {xol_vecs};
    Dg100SerialFormat dg100_fmt;
@@@ -199,22 -196,20 +181,16 @@@
    Dg200SerialFormat dg200_fmt;
    Dg200FileFormat dg200_ffmt;
    LegacyFormat navilink_fmt {navilink_vecs};
 -  LegacyFormat ik3d_fmt {ik3d_vecs};
    OsmFormat osm_fmt;
-   LegacyFormat destinator_poi_fmt {destinator_poi_vecs};
-   LegacyFormat destinator_itn_fmt {destinator_itn_vecs};
-   LegacyFormat destinator_trl_fmt {destinator_trl_vecs};
    ExifFormat exif_fmt;
 -  LegacyFormat igo8_fmt {igo8_vecs};
    HumminbirdFormat humminbird_fmt;
    HumminbirdHTFormat humminbird_ht_fmt;
-   LegacyFormat gnav_trl_fmt {gnav_trl_vecs};
 -  LegacyFormat mapasia_tr7_fmt {mapasia_tr7_vecs};
    LegacyFormat navitel_trk_fmt {navitel_trk_vecs};
-   LegacyFormat ggv_ovl_fmt {ggv_ovl_vecs};
    LegacyFormat itracku_fmt {itracku_vecs};
    LegacyFormat itracku_ffmt {itracku_fvecs};
    LegacyFormat sbp_fmt {sbp_vecs};
    LegacyFormat sbn_fmt {sbn_vecs};
 -  LegacyFormat mmo_fmt {mmo_vecs};
    LegacyFormat v900_fmt {v900_vecs};
-   LegacyFormat enigma_fmt {enigma_vecs};
    SkytraqFormat skytraq_fmt;
    TeletypeFormat teletype_fmt;
    SkytraqfileFormat skytraq_ffmt;
@@@ -223,9 -218,10 +199,7 @@@
    SubripFormat subrip_fmt;
    LegacyFormat format_garmin_xt_fmt {format_garmin_xt_vecs};
    GarminFitFormat format_fit_fmt;
-   EnergymproFormat energympro_fmt;
 -  MapbarTrackFormat mapbar_track_fmt;
 -  MapfactorFormat mapfactor_fmt;
 -  MyNavFormat mynav_fmt;
    GeoJsonFormat geojson_fmt;
-   GgvBinFormat ggv_bin_fmt;
    GlobalsatSportFormat globalsat_sport_fmt;
    QstarzBL1000Format qstarz_bl_1000_fmt;
  #endif // MAXIMAL_ENABLED